Auto merge of #1574 - alexcrichton:rustup, r=alexcrichton
authorbors <bors@rust-lang.org>
Sun, 3 May 2015 19:43:40 +0000 (19:43 +0000)
committerbors <bors@rust-lang.org>
Sun, 3 May 2015 19:43:40 +0000 (19:43 +0000)

Trivial merge